Conflicts:
	MerchantRPGCSE2102/src/controller/RPGame.java

…ained within one window only.

working on collision detection.

…ss for MerchantSprites. Also refactored with a hope to differentiate the use of (row, col) and (x, y). Rows and columns will be used to represent the Player and Merchants' locations on the Graph. x and y variables are used to prepresent the PlayerSprite and MerchantSprite's location on the canvas in pixels. The current scale is: x = 30*column and y = 30*row where 30 is the width/height of each sprite.